Merger from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Jan 2010 08:49:15 +0000 (03:49 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Jan 2010 08:49:15 +0000 (03:49 -0500)
commit0cad20830f13adcecc3ffbdde99a92b2c295a1ff
treea916ad5f077cd6b2c0e43ec8d35299bed088d285
parenta4275fc3e182823e7d95c7df89ff9a0c1ed769e4
parentd943d77d845eb9d426aee8bc4aad01c9d4a6fd17
Merger from mainline.
src/xdisp.c